Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 2 Sep 2010 04:31:05 +0000 (04:31 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 2 Sep 2010 04:31:05 +0000 (04:31 +0000)

Trivial merge